Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Mon, 30 May 2016 17:56:26 +0000 (13:56 -0400)
committerTom Rini <[email protected]>
Mon, 30 May 2016 17:56:26 +0000 (13:56 -0400)

Trivial merge